Make --g-fatal-warnings a G_OPTION_ARG_NONE, since it doesn't take an

2004-09-29  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmain.c: Make --g-fatal-warnings a G_OPTION_ARG_NONE,
	since it doesn't take an argument.

diff --git a/ChangeLog b/ChangeLog
index 68e53c6cb521d470edbda54d46e5c9cf4dac5d63..165d8587bea596e64a6cb0e2c252d500bee2f90a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmain.c: Make --g-fatal-warnings a G_OPTION_ARG_NONE,
+       since it doesn't take an argument.
+
 2004-09-29  Christopher Blizzard  <blizzard@redhat.com>
 
        * gtk/gtkmenutoolbutton.h: Remove trailing semicolon on

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 68e53c6cb521d470edbda54d46e5c9cf4dac5d63..165d8587bea596e64a6cb0e2c252d500bee2f90a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-09-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmain.c: Make --g-fatal-warnings a G_OPTION_ARG_NONE,
+       since it doesn't take an argument.
+
 2004-09-29  Christopher Blizzard  <blizzard@redhat.com>
 
        * gtk/gtkmenutoolbutton.h: Remove trailing semicolon on

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 68e53c6cb521d470edbda54d46e5c9cf4dac5d63..165d8587bea596e64a6cb0e2c252d500bee2f90a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-09-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmain.c: Make --g-fatal-warnings a G_OPTION_ARG_NONE,
+       since it doesn't take an argument.
+
 2004-09-29  Christopher Blizzard  <blizzard@redhat.com>
 
        * gtk/gtkmenutoolbutton.h: Remove trailing semicolon on

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 68e53c6cb521d470edbda54d46e5c9cf4dac5d63..165d8587bea596e64a6cb0e2c252d500bee2f90a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-09-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmain.c: Make --g-fatal-warnings a G_OPTION_ARG_NONE,
+       since it doesn't take an argument.
+
 2004-09-29  Christopher Blizzard  <blizzard@redhat.com>
 
        * gtk/gtkmenutoolbutton.h: Remove trailing semicolon on

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index ec6c9f8cb292a7a7f87a83cbca01abb38e7410b8..f9d15b1daef53a8a4c154232e5c4825827453f4c 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -350,6 +350,7 @@ gtk_disable_setlocale (void)
 #endif
 
 static GString *gtk_modules_string = NULL;
+static gboolean g_fatal_warnings = FALSE;
 
 #ifdef G_ENABLE_DEBUG
 static gboolean
@@ -389,23 +390,11 @@ gtk_arg_module_cb (const char *key, const char *value, gpointer user_data)
   return TRUE;
 }
 
-static gboolean
-gtk_arg_warnings_cb (const char *key, const char *value, gpointer user_data)
-{
-  GLogLevelFlags fatal_mask;
-
-  fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
-  fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL;
-  g_log_set_always_fatal (fatal_mask);
-
-  return TRUE;
-}
-
 static GOptionEntry gtk_args[] = {
   { "gtk-module",       0, 0, G_OPTION_ARG_CALLBACK, gtk_arg_module_cb,   
     /* Description of --gtk-module=MODULES in --help output */ N_("Load additional GTK+ modules"), 
     /* Placeholder in --gtk-module=MODULES in --help output */ N_("MODULES") },
-  { "g-fatal-warnings", 0, 0, G_OPTION_ARG_CALLBACK, gtk_arg_warnings_cb, 
+  { "g-fatal-warnings", 0, 0, G_OPTION_ARG_NONE, &g_fatal_warnings, 
     /* Description of --g-fatal-warnings in --help output */   N_("Make all warnings fatal"), NULL },
 #ifdef G_ENABLE_DEBUG
   { "gtk-debug",        0, 0, G_OPTION_ARG_CALLBACK, gtk_arg_debug_cb,    
@@ -460,6 +449,15 @@ static void
 do_post_parse_initialization (int    *argc,
                              char ***argv)
 {
+  if (g_fatal_warnings)
+    {
+      GLogLevelFlags fatal_mask;
+
+      fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
+      fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL;
+      g_log_set_always_fatal (fatal_mask);
+    }
+
   if (gtk_debug_flags & GTK_DEBUG_UPDATES)
     gdk_window_set_debug_updates (TRUE);